projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a564e6 3a0c731)
bitkeeper revision 1.1159.212.35 (41f5ae28rGX5ZRYjiv0VTWqCmka9oA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Tue, 25 Jan 2005 02:25:44 +0000 (02:25 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Tue, 25 Jan 2005 02:25:44 +0000 (02:25 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

1  2 
xen/Makefile patch | diff1 | diff2 | blob | history

diff --cc xen/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.